*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2134aa3af2f1764fde3a568799e5dd9aea2b4397..4861070228f0ee9d983f8e29f68fe23040be086b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2006-12-15  Kevin Gallagher <Kevin.Gallagher@boeing.com>
+
+       * emulation/edt.el (edt-xserver): 
+       * emulation/edt-mapper.el (edt-xserver): Replace `/' with a `-',
+       to fix a problem on Cygwin.
+
+       * emulation/edt.el
+       * emulation/edt-mapper.el
+       * emulation/edt-lk201.el
+       * emulation/edt-pc.el
+       * emulation/edt-vt100.el: Update maintainer's email address.
+
 2006-12-15  Simon Marshall  <simon@gnu.org>
 
        * progmodes/cc-fonts.el (c-font-lock-declarations): Fix previous

diff --git a/src/ChangeLog b/src/ChangeLog
index 104a1503e3d677499312f949e241546218e9a17e..620185543b566ebc4074a9aedb70fec60816bac6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-15  Eli Zaretskii  <eliz@gnu.org>
+
+       * emacs.c (USAGE3): Clarify documentation of --color.
+
 2006-12-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * mac.c (wakeup_from_rne_enabled_p) [TARGET_API_MAC_CARBON]: New